Revert 0effbe4..dabd7bd

This rolls back to commit 0effbe4ab28fab4ece3daadd7a739c31f5e5b8d3.