Revert 0052d8e..a2c26bd

This rolls back to commit 0052d8ea1f841cb3e86b2e189d2804137ee02ab4.