Revert a5e0d98..91ed2df

This rolls back to commit a5e0d98a7a73de0ccd11d4630088c3f9921c0cda.