Revert eb3e0a2..b0bf0c0

This rolls back to commit eb3e0a260bbbf94d62acec2d960ce667dcf9692e.