Revert fce9dfb..3a1ecd2

This rolls back to commit fce9dfb2d1c25b9fc6602d9c0ef49581ce26e3cb.