Revert 11bc874..a6d2c3a

This rolls back to commit 11bc87430e61d99d14e935bc777e12d8b79a9891.